Merge "Initial refactoring to enable the addition of the SkiaOpenGLPipeline."