Merge "core_ctl: Fix an issue where CPUs are left un-isolated for long time"