 
         if (trackScrollTimer)
             trackScrollTimer.reset();
+            
+        if (smoothScrolling && !animatingSinglePage)
+        {
+            if (animator.isPlaying)
+            {
+                animationEndHandler(animator);
+            }
+            // Stop it regardless, in case the animation is startDelayed and
+            // thus not 'playing', but still active
+            animator.stop();
+        }
     }
 
     /**

            // Note that this behavior, resetting the initial delay, differs 
            // from Flex3 but is more consistent with general application
            // scrollbar behavior
            trackScrollTimer.delay = REPEAT_DELAY;
            trackScrollTimer.repeatCount = 1;
        }
        trackScrollTimer.start();
    }

    /**
     *  @private
     *  This gets called at certain intervals to repeat the scroll 

    // Properties
    //
    //--------------------------------------------------------------------------
    
    //---------------------------------
    // smoothScrolling
    //--------------------------------- 
    /**
     * This property determines the default value <code>smoothScrolling</code>
     * for all ScrollBars.
     * 
     * @default true
     * @see #smoothScrolling
     */
    public static var smoothScrollingDefault:Boolean = true;
    
    //---------------------------------
    // smoothScrolling
    //--------------------------------- 
    
    /**
     * @private
     * Backing storage for the smoothScrolling property
     */
    private var _smoothScrolling:Boolean = smoothScrollingDefault;
    
    /**
     * This property determines whether the scrollbar will animate
     * smoothly when paging and stepping. When false, page and step
     * operations will jump directly to the paged/stepped locations. 
     * When true, the scrollbar, and any content it is scrolling, will
     * animate to that location.
     * 
     * @default true
     */
    public function get smoothScrolling():Boolean
    {
        return _smoothScrolling;
    }
    
    public function set smoothScrolling(value:Boolean):void
    {
        _smoothScrolling = value;
    }
    
    //---------------------------------
    // pageSize
