Merge \\"QS: Fix leak in QSAnimator\\" into nyc-dev am: 883da638e2
am: d97d435c09

Change-Id: I62c2c08e956a59e9c6cee2397a003cff960eb5d1