Merge "Cancel animation and jump to current state if not animating picker"...
Merge "Cancel animation and jump to current state if not animating picker" into nyc-dev am: d8c38b89
am: 784aa149
* commit '784aa149':
Cancel animation and jump to current state if not animating picker
Change-Id: Ia998b2b81700a2f3761aed705cd840691f9964d6