Merge "Revert "[ML1] Introduce RichInputMethodSubtype""