Merge change 3753 into donut

* changes:
  Fix NPE in music app.