Merge "QS: Fix leak in QSAnimator" into nyc-dev