Merge "WifiScanner.ScanData: Address API council feedback" into sc-dev