Merge "slim_msm: Retry initial sequence messages" into msm-3.4