Merge "[ML1] Introduce RichInputMethodSubtype"