Merge "core_ctl: Switch isolation to new hotplug state callbacks"