Merge "Fix stopBatchedScan not working for wifi" into klp-dev