Merge "Call showInputMethodPicker instead of showInputMethodSubtypePicker"