[automerger skipped] Merge "Fixes an issue where the wrong icons where ambient" into qt-dev
am: 95a633d653 -s ours
am skip reason: change_id I2e571353735efb0d763ecc236f60aefe4c2b51d4 with SHA1 da330ff413 is in history

Change-Id: I2f5d9d65a73f5ee618a770ce5fe60631b3da621f