Merge "Warn makeDefault ignored for system settings only if true"