Merge "Fix bug 6892600 Font (character pairs) rendering issue" into jb-mr1-dev