Merge "Fix the issue on the inconsistent condition of InputMethodSubtype" into jb-dev