Merge "Fix hasGlyph() for pre-v23" into nyc-support-25.2-dev