Merge "Fixed an issue where the notification could stay userlocked" into oc-dev