Merge "WifiScanningServiceImpl: cleanup unused commands"