Merge "diag: Release mutex in corner case" into msm-3.0