Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev