Merge "CameraDevice3: Fail stream configuration more gracefully" into nyc-dev