BZ-9920: Changes to preserve the info while navigate through the wizard steps