Merge "Camera3Device: Clean up next request batch variable" into mnc-dr-dev