Merge "Fix issue where the notification could snap to the menu while its invisible" into oc-dev am: 043ae355e9
am: 86df7a6574

Change-Id: I4047847af9801e4d8dd9db45be54772abc0fc8d7