Merge "Fix RenderThreadInfo lifetime and cleanup"