Merge "Fetch roundIcon|icon depending on RRO overlayed config_useRoundIcon"