Merge "Support for BLE assisted discovery and pairing" into main