Merge "Don't show both the IME Switcher and A11Y buttons" into main