Merge "Allow configuring distinct upload dialog comments for local/foreign uploads"