am 663fea34: Fix crash in music app. Monkey found it, but it\'s easy to repro by a human too.

Merge commit '663fea34b586fbdf46acebdb86e163aca0e50323'

* commit '663fea34b586fbdf46acebdb86e163aca0e50323':
  Fix crash in music app. Monkey found it, but it's easy to repro by a human too.