Merge "Updated SkiaGLRenderEngine stretch logic" into sc-dev