Merge "ToneGenerator: fix overflow in stopTone" into jb-mr2-dev