Merge "Fix unlock sim thread leak" into main