Merge change 3551 into donut

* changes:
  Allow the owner to reconnect to Camera.