Merge "[Upload] Moved async upload stuff to the job queue."