Merge change 1923 into donut

* changes:
  Fix crash in MusicPicker activity