Merge "Fix issue where the notification could snap to the menu while its invisible" into oc-dev