Merge "Preserve enabled subtypes across disabling and re-enabling an IME" into lmp-dev