Update UploadWizard to master

Change-Id: If1cc6f2a44c7980bb7ebf653481bbaae2bc7cb79
Merge "Update UploadWizard to master" into wmf/1.22wmf7