am 95c4919a: Merge change 1923 into donut

Merge commit '95c4919a2811d131a2d4d8d7eaa83758cd082313'

* commit '95c4919a2811d131a2d4d8d7eaa83758cd082313':
  Fix crash in MusicPicker activity