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

Change-Id: I1473f065885e599cb04e045f0096826ed02f417f