Merge "Refactor RenderAreaFuture to use RenderAreaBuilder" into main