Merge "Make Wifi Scans more heap-efficient" into klp-dev