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

Change-Id: I1018d51c400de084cff8c4de7c633488c9f6070f