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

Change-Id: I2997be04f1b6b518bc11dd291e2ae1fba55453ea