Merge "Fix visual bugs in Skia-RenderEngine"