Merge "Fix oval positioning when drawn with patheffect" into nyc-dev