Merge "Simplify InputMethodSubtypeSwitchingController a bit" into main