Merge "Fixes an issue where the wrong icons where ambient" into qt-dev
am: 95a633d653

Change-Id: Icc2e91152c2f6e9010e4a9b6903b8e753b40be45