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