Merge "Fix issues from recent glyph caching change"