Merge "Cancel animation and jump to current state if not animating picker" into nyc-dev