Merge "Simplify InputMethodUtils a bit" into main