Merge "Revert "Revert "[ML1] Introduce RichInputMethodSubtype"""