Merge "Do not reset IME Subtype in InputMethodConfig fragment"