Merge "Work-around for a Skia rasterization bug Bug #6411457" into jb-dev