Merge "Ensure menu option visibility correctness" into ub-gmail-ur12-dev