Merge "Simplify IMMS#onImeSwitchButtonClickFromClient()" into main