Merge "Add explicit override for default Private DNS mode" into pi-dev