Merge "Reset the default system ime to the proper one when the system locale is changed" into jb-dev