[automerger skipped] Merge "Fixes an issue where the wrong icons where ambient" into qt-r1-dev am: d434adf1f1
am: b252ffef4d -s ours
am skip reason: change_id I2e571353735efb0d763ecc236f60aefe4c2b51d4 with SHA1 3a53ff9f92 is in history

Change-Id: Iec9dd06f57e7db79737da9d483b7b85135af3cb9