Merge change 2706 into donut

* changes:
  Fix issue 1883666: Audio coming from the music player stopped suddenly