Merge "Fix damage tracking for RenderNode drawn twice"