Merge "Remove RichInputMethodManager.updateShortcutIME call from SubtypeSwitcher"