Merge "ToneGenerator: fix stop/destroy concurrency" into jb-mr2-dev