Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread