Merge "Fix ToneGenerator regression"