am e13f3754: Merge "Don\'t hide sync settings, v2 (cleaner)"

* commit 'e13f3754119af2db2fdf461755bcebdada670963':
  Don't hide sync settings, v2 (cleaner)