Merge "Prepare to make InputMethodSubtypeSwitchingController per-user" into main