Merge changes from topics "scanner_multiple_sta", "sta_sta_same_bands"

* changes:
  WifiScanner: Add missing @hide constants
  WifiScanner: Add support to add more results to ScanData