Merge "ToneGenerator: Fix possible multiply overflow" into main