Merge "Fix the issue on the input method switch picker" into jb-mr1-dev