Merge changes Icb8e2097,I9a2a16f9 into nyc-dev

* changes:
  Optimization for TouchAnimator
  QS Animations - first pass, still not spec