Merge "Limit Jack threads during tests"