Merge "Changing disconnectHeadset calls." into kraken