Merge "slim_msm: Keep track of satellite reconfiguring a channel" into msm-3.4