Merge "Camera2: Fix deadlock on shutdown due to client getting killed." into jb-mr2-dev