Merge "core_ctl: Take state_lock while preparing the global_state" into msm-4.9