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

Change-Id: I00414432f7b55038c1cd0c9bda83935c2f25ce40