Merge "Correctly check the height of a glyph prior to caching it" into jb-mr1-dev