Merge "Increase test bg thread timeout" into main