Merge "Don't crash when presented with non-roundRect clipping outline." into oc-dev