Move upload retry count check into service eligibility routine, before activity download