Merge "Properly support the opaque flag in Skia RenderEngine"