Fixes #12398. All combinations of new/existing upload should now be handled correctly.

3 jobs for UploadRequiredCheckFailed in 6 minutes and 8 seconds (queued for 1 second)