Merge "Fix default DNS not being set on network changes"