Merge "ASurfaceControl: dataspace (1/2)"