[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 skip reason: change_id Ia64238f30620d9906aa50c2469121c2653875e8d with SHA1 5dc581aef2 is in history

Change-Id: I34894ba27d2cff309d61baf0611b18b5d0e1d0af