Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev