Merge "Don't hide sync settings, v2 (cleaner)"