Merge "Fix glyph cropping bug" into jb-mr1-dev