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