(CU+5909): Apply new conventions for glyph granularity for components