Merge "Update BT pairing dialog"