Conditional animation is actually unnecessary, it appears that UIView animation will optimize for duration == 0.