Make sure animation speed isn't too slow

Previously, animations were set so the speed could be very slow.  Now,
it's at least one frame every two seconds.
Merge branch 'set-animation-speed-threshold-rebased'