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: 3f9d17fb
* commit '3f9d17fb':
Cancel animation and jump to current state if not animating picker
Change-Id: I6834b9dfdde724dab3fe69a1467338f7c100ea99