Merge "Fixed that notifications could be stuck and invisible on AOD" into qt-dev
am: 791b161405

Change-Id: I1147c44924165fefad8d23e0f8ee1f2f4c15891e