Merge "Update auto wi-fi to prompt user for permissions" into pi-dev