Merge "Remove unused ScanSettings and WifiChannel classes" into pi-dev