Merge "Avoid thrashing the glyph cache during the precache phase" into jb-mr1-dev