Merge pull request #20831 from aaronlehmann/concurrent-upload

Fix concurrent uploads that share layers