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

* commit '649449dbb777e58ea5f6f1af61f84022d088190c':
  Add SurfaceControl::disconnect() to disconnect currently connected API