Merge "Stop the created handler threads" into main