Merge "[DO NOT MERGE] Improvements and fixes for BLE scanning within CDM" into sc-dev