Merge "Inline IME subtype switching ControllerImpl" into main