Merge "Fix notification stuck on AOD" into qt-r1-dev