am 1270223b: Merge "Ensure menu option visibility correctness" into ub-gmail-ur12-dev

* commit '1270223b2b3df8468d5957b31caf2d00da7331fd':
  Ensure menu option visibility correctness