Merge "Camera3: don't let dequeueBuffer block indefinitely"