Combine Manual and Automatic Sync Preferences
Closes #388