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

Change-Id: I541a5d64c0111057b709ca7179ff439da02bed29