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

Change-Id: I1835b0a6ba2b5b677ba0ec33c9ba3749364e819e