Merge "Update InputMethodSubtypeSwitchingController correctly"