Merge "Update UploadWizard-specific messages"