Merge "Slightly refactor IPv4 default router interface selection"