Merge "Add setDataSpace SurfaceControl API"