Launch restore step early

During restore, Settings which the user may have set earlier during setup may be overwritten. Avoid this by restoring before allowing the user to set new values

Change-Id: Id64378fb44e00da1c666cba7a737f03f9f0b88b8