Merge "Fix using EDNS0 when no private DNS validated"