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

* commit '2d595c0efc0eee9e0c94f4842c6fed07c19163c1':
  ToneGenerator: fix stop/destroy concurrency