Merge "Fix error in RenderNode unit test with Skia pipeline"