Merge "Fix startBluetoothSco race"