Merge "SpecialUploadStash: Use Config instead of globals"