am f557832a: (-s ours) am 1c9d1485: am 6d4873f5: am 0511ba50: Do not persist and restore the media button event receiver

* commit 'f557832ad82041b17a15448e3b776fdef4ba747b':
  Do not persist and restore the media button event receiver