Merge "Camera2: Fix deadlock while zooming during record" into jb-mr1-dev