Merge "Fix issue that the disconnect tone doesn't sound from BTHS"