Merge "Always try to set/remove default routes"