Merge change I347fe57e into eclair

* changes:
  1915450: Make the music widget show pause state properly