Merge "Perf: keep events across hotplug"