Fix issues related to recycling ContextualUndoViews as list-items related to animations.
(cherry picked from commit ff921c2)