Merge "Fix thread leak in HttpEngineTest" into main