Merge "Paramaterize and adjust the glyph cache sizes" into jb-mr1-dev