Merge "Lower the BLE connection supervision timeout to 5s."