Only perform the animation block through UIView animation if it's actually animated.
Layout views a bit more often. viewDidAppear is too early.