Merge "Don't do layout in hasGlyph for codepoint + vs" into nyc-dev