am 7258665b: am c58595f2: am 4869faf4: Revert "Move global sync settings to AccountSettings."

* commit '7258665bd0a6b5693cf0b38faaee16af9d20bae9':
  Revert "Move global sync settings to AccountSettings."