Merge "Revert "Terminate ICS (for BT) after the disconnect tone finishe...""