Merge "DO NOT MERGE: Fixed an issue about notification icons on AOD" into qt-dev
am: c65d4b728c

Change-Id: I5d316626d0b2e5f397b3e5ebac951bf4320e76ca