Merge "Make stream tracing have a higher thread count on host"