Some major changes to WiFi ES to avoid blocking main thread due to broadcast scans and to handle collected data more efficiently