am 42c6acb6: Merge "Close dangling camera proxy" into ub-camera-glacier

* commit '42c6acb68103692ce4142d1b013dfced203c2271':
  Close dangling camera proxy