Merge "Glop SkiaShader support"