Update UploadWizard

Change-Id: I12a86428c3125e628b9307fe017f529f6c936057
Merge "Update UploadWizard" into wmf/1.23wmf4