Merge "Fix the display name of InputMethodSubtype"