[TS-1652]  Mutex leak fix

test/review: amc, zym, jpeach, igalic
backport: igalic