Merge "Save and update enabled Subtypes in InputMethodAndSubtypeEnabler"