Merge "Forcing no animations to be played if swiping fast" into oc-dev am: b4f3e4300c
am: ffb1bdb7ab

Change-Id: I3138386d7a2d85898e4e1b2310801522d0fad539