Merge "Fix Wifi Batch Scanning" into klp-dev