am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver

* commit 'e1f07060b8c94cc02309172fb9fb8cd4bd0e35f7':
  Do not restore the media button event receiver