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