Merge "Fix InputMethodSubtypeSwitchingController tests" into main