Merge "WifiScanner: cleanup unused commands"