Merge Thai Text Rendering Changes to Develop.