Merge "Don't update OverScroller fling state if no time has passed since start" into lmp-mr1-dev