Merge "Camera3: Fix flush call deadlock"