Merge "Fix the tones playing count in InCallTonePlayer"