Merge "[automerger skipped] Merge "DO NOT MERGE: Fixed an issue about notification icons on AOD" into qt-dev am: c65d4b728c -s ours am: 839b1659cd -s ours
am: bef91e9a9c -s ours
am skip reason: subject contains skip directive

Change-Id: I8d89027a724778d2691ffb721b832285f3b8b19d