Fix timing of disabling scroll for animation