Merge "Quit handler threads at the end of the tests" into main