Merge "Change InputMethodPreference icon size"