Merge "Reconnect to wifi if supported" into main