Merge "Add SurfaceControl::disconnect() to disconnect currently connected API" into nyc-dev