Merge "Private DNS: Fix handling of null mode"