Merge "ToneGenerator requests fast track"