Merge "Replace dns_tls with private_dns_mode setting"