Fix unmap-during-animation

When disabling animation on unmap, we need to complete a running
animation and properly unregister from the clock.