Merge "Add fillRule support to VDC" into nyc-support-25.4-dev