AppSettings: Move some backward compatibility code to UpdateSettings()