Merge "Fix Bluetooth failing to connect after pairing"