Merge "Bluetooth: Resolved a race condition"