(g2-M-15625): Apply new conventions for glyph granularity for a