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