Merge "msm: sps: improve BAM inactivity timer function"