Merge "Merge "Fix notification stuck on AOD" into qt-r1-dev am: 08fcdd9877 am: 8cb08c0d61"