Merge "Use MonitorThreadLeak in CSTest related tests" into main