Merge "Move the Private DNS dialog back to the top level." into pi-dev