Merge "Set the color space to sRGB on the Surface and remove colorFilter."