Merge changes I70299512,I42df29b4 into nyc-dev

* changes:
  Add tests for TouchAnimator
  Fix TouchAnimator callbacks