am c3c7b92a: Merge "Clean up role of component name in media button event receiver" into jb-mr2-dev

* commit 'c3c7b92a8128831445d2a185b0986c60d929b150':
  Clean up role of component name in media button event receiver