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