Merge "Clean up InputMethodService" into main