Merge "Move current subtype management code to RichInputMethodManager"