Merge "Fix BLE scan leaks" into oc-dr1-dev