Merge "Revert^2 "Add API for Custom IME Switcher button visibility"" into main