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