Merge "Fixed an issue where the notification could stay userlocked" into oc-dev
am: dc66506f0a

Change-Id: Ia2ea2f1b69bdcab2d27a56e89fbfb87b8cc11eed