Merge "CameraSource: Wait before dropping a frame" into nyc-dev