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