Merge "WifiScanner: Scanner enable/disable"