Merge "Correctly account for negative fling directions." into nyc-mr1-dev