Merge "Fix an upgrade bug in SettingsProvider." into froyo