Merge "Wifi state reset when disconnected"