Merge "[SurfaceFlinger] Make sure data space is set correctly" into pi-dev