Merge "msm: footswitch-8x60: Update collapse steps for memory retention robustness" into msm-3.0