am 084af5e1: Merge change 3551 into donut

Merge commit '084af5e1977e2278e68a69615f55d5fe3bb6c1a4'

* commit '084af5e1977e2278e68a69615f55d5fe3bb6c1a4':
  Allow the owner to reconnect to Camera.