am c1ec88a5: am e8a75871: Merge "Possible fix for dead handler in Music button event sending" into lmp-dev

* commit 'c1ec88a508ac65f27c83ecf3fd4ab9bb4c19a8b1':
  Possible fix for dead handler in Music button event sending