(UU+5831): Apply new conventions for glyph granularity for components