Merge "Catching additional case where menu would disappear in accessibility." into oc-dev am: 6a9f4a997c
am: 7c3db61d91

Change-Id: If8ffedcf1c617fb7ab54375a4944c564170aad86