Merge "ToneGenerator: Increase buffer framecount" into nyc-mr1-dev