Merge "Fix broken build when DEBUG_GLYPHS is set"