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
am: 93b15870
* commit '93b15870':
Cancel animation and jump to current state if not animating picker
Change-Id: Ic72675504ac72cd1b19ec8049fd56b3f54401b72