Merge "Fix bug #6495019 Character gets garbled when locale is changed" into jb-dev