Merge "Camera3: don't let dequeueBuffer block indefinitely" into nyc-mr1-dev