Merge "Fix RenderArea use after free error"