Merge "Add support for batched wifi scans." into klp-dev