Merge "Correct stride for drawing to cached glyph bitmap"