Merge "Cleanup of a11yMenuHideBeforeTakingAction" into main