Update UploadWizard to master tip

Change-Id: I8693274a14be0e80d7a3acaf4a3bc104421589a3
Merge "Update UploadWizard to master tip" into wmf/1.22wmf17