Merge "Refactor WifiScanWorker"