Merge "Add cancel button for private dns dialog" into pi-dev