Merge "msm: Fix mutex deadlock with circular wait"