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

Change-Id: Ib3543050889a29bc3219a9950d15cc25ff401255