Merge "Refactor thread leak monitoring" into main