Merge "Import wizard does not remember last wizard"