Tweaked upgrade behavior so that it feels natural even when upgrading from older firmware versions that are not capable of exporting their settings.