Merge change 25344 into eclair

* changes:
  Add "Sync Contacts" to Account preferences screen (part of #2106733)