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