Merge changes from topic "remove-scoped-connection"

* changes:
  Remove usage of scoped connections.
  Allow SurfaceControl to be passed over AIDL.