NXP-11634 Allow batch to wait for ongoing uploads