Merge "Fix crash while device is pairing / unpairing."