am 2458d482: Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev

* commit '2458d482c4822c6f9e6274f5bd12b6aea095a9cd':
  Camera2: Always disconnect in the client destructor