Merge "WifiScanner: check nullness of bundle extra"