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