Merge "Fix some task view fling calculations"