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