Merge "Change the Auto-select Network UI." into pi-dev