Merge "msm: bam_dmux: Extend locking around SPS transfer call" into msm-3.4