Merge "Revert "Clean up user handling in UploadStash""