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