[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
am: 4fce1c21 -s ours
am skip reason: change_id I2e571353735efb0d763ecc236f60aefe4c2b51d4 with SHA1 da330ff4 is in history
Change-Id: I34efefaa1eeb72c7eeb850d2ee80172b6a62446b