Merge "fix bug where sync settings set lost upon upgrade from donut and eclair to froyo"