Merge "PixelCopy fixes" into nyc-dev