Merge "Make InputMethodSubtype thread safe" into jb-dev