am 49e36ea9: Clean up some handlers when the service is destroyed. This should fix some more of the monkey bugs in the music app.

Merge commit '49e36ea916aefba042c6e927c771b10708b6891e'

* commit '49e36ea916aefba042c6e927c771b10708b6891e':
  Clean up some handlers when the service is destroyed. This should fix some more of the monkey bugs in the music app.