Merge "Fix BLE scan leaks" into oc-dev