Merge "Keep BT pairing dialog valid until timeout"