Merge "QS Anim tweaks" into nyc-dev