Merge "QS Anim tweaks" into nyc-dev
am: ede7d95

* commit 'ede7d958ab54a0701baa8ae8b494e8ea905c61c6':
  QS Anim tweaks