Merge "Properly pre-cache latin glyphs Bug #6408362" into jb-dev