am 1a5f387b: Merge "Revert "Don\'t update the text services locale in the main...
am 1a5f387b: Merge "Revert "Don\'t update the text services locale in the main thread"" into jb-mr1-dev
* commit '1a5f387b':
Revert "Don't update the text services locale in the main thread"