Merge "Fix compilation issue when DEBUG_GLYPHS define is activated"