Merge "Perf: Support sw events across hotplug"