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