Merge "Don't count zero width space in hasGlyph layout" into nyc-mr1-dev