Merge "Actually fix the QS anim curves" into nyc-dev