Merge "Refresh pref settings for cloud sync"