Only perform the animation block through UIView animation if it's actually animated.
Layout views a bit more often. viewDidAppear is too early.
Merge branch 'develop' into release/1.1.5
Build bump to 6.