Backported some prefs from branding to client