Merge "Improve handling of invalid private DNS settings"