Merge "[SurfaceFlinger] Respect HDR data space." into pi-dev