Merge "perf: enable perf to continue across hotplug" into msm-4.9