Merge "In UploadStash, prioritize core metadata over file handler metadata"