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

Change-Id: I2a5a0d55fb01091deb00aa7d79f72344207e8793