Merge "Small cleanup on InputMethodInfo"