Merge "Add NO_BATCH flag to WifiScanner" into m-wireless-dev