Merge "sched/core_ctl: Fix state_lock spinlock contention" into msm-4.9