Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev am: 7b04275a68
am: f53ce454f4

Change-Id: I763d062729a083c29f53bd2c5065fd07762f0bf3