Merge "Bug 2639807 - Add smarter smoothing to home screen touch scrolling." into froyo