Issue #20715: Fixed chart remove and rendering issue