Merge "Fix an issue on showInputMethodPickerFromClient" into jb-mr1-dev