Merge "Initial implementation of WifiScanner"