Merge "Make glyph copies a little more cache friendly" into jb-mr2-dev