Merge "Forcing no animations to be played if swiping fast" into oc-dev