Merge "Perf: preserve registers across hotplug"