Merge "Fix render thread early termination" into main