Merge "ToneGenerator: optimize silent tone" into jb-mr2-dev