Merge "QS Animation tweaks" into nyc-dev