Merge "Camera3Device: Wait for empty in-flight map when waiting for idle" into nyc-mr1-dev