Merge "[SurfaceFlinger] Update ColorLayer to set dataspace."