Merge "Break flings with opposing velocities" into jb-mr1-dev