Merge "Revert "Don't update the text services locale in the main thread"" into jb-mr1-dev