[automerger skipped] Merge "DO NOT MERGE: Fixed an issue about notification icons on AOD" into qt-dev am: c65d4b728c
am: 7cfda2b91c -s ours
am skip reason: change_id Ia64238f30620d9906aa50c2469121c2653875e8d with SHA1 5dc581aef2 is in history

Change-Id: I1fce41e5ffdedc02432715cb3741ce68be857a1b