Merge "Fix bug 6888377: crash in GetUnitsPerEm on locale change" into jb-mr1-dev