Merge "Fix BTHS is still in pairing list after BTHS is connected"