Fix Flickr imports in UploadWizard

Change-Id: I9b9e3b6c6f88523d613abcb3717ed9c84f08e835
Merge "Fix Flickr imports in UploadWizard" into wmf/1.25wmf11