Merge "Fix PixelCopyTest failure in CTS"