Merge "Fix broken test by increasing Thread#join timeout" into main