am 5ad00c66: Fix crash in music app.

Merge commit '5ad00c6691f46e81a4c1611d0ccc351beed98508'

* commit '5ad00c6691f46e81a4c1611d0ccc351beed98508':
  Fix crash in music app.