Merge "slim_msm: Satellite channel should not be deallocated more than once" into msm-3.4