am 23b531ec: Fix more bugs when no music is present.

Merge commit '23b531ec31c406f96fca82bfb9b04e26d05187b4' into eclair-mr2

* commit '23b531ec31c406f96fca82bfb9b04e26d05187b4':
  Fix more bugs when no music is present.