[automerger skipped] Merge "Fixes an issue where the wrong icons where...
[automerger skipped] Merge "Fixes an issue where the wrong icons where ambient" into qt-dev am: 95a633d6 -s ours
am: f4667ecb -s ours
am skip reason: change_id I2e571353735efb0d763ecc236f60aefe4c2b51d4 with SHA1 da330ff4 is in history
Change-Id: I9d1be0d273c3d5c783e668b0d73e4399a81e815c