Merge "Move startup thread pool back into runtime"