Merge "Fix bug 2724503 Persist media button receiver across reboots"