Merge "Add unit test for Skia path behavior" into oc-dev