Merge "Camera2: Fix potential deadlock" into jb-mr1-dev