Merge "Fix for tone glitch produced in ToneGenerator"