Merge "[Ravenwood] Always provide main thread" into main