Merge "Fix an issue in SurfaceTexture with forgetting the dataspace"