Merge "Increasing timeout for RecursiveTaskTest"