Merge "Fix a regression in InputMethodUtils." into nyc-dev