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

Change-Id: Ic0c33365a19ee048a01aa6c7c3e8e3908b3e26e6