Added fix for saving import list and return to upload screen after   Ticket: GCP-9449