Merge "Glyph cache optimization" into jb-mr1-dev