Merge "Fix Linux first-time rendering"