Merge "Merge "Fixed an issue where the notification could stay userlocked" into oc-dev am: dc66506f0a am: 81c8d5f861" into oc-dr1-dev-plus-aosp