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

Change-Id: I7e8f106c741a8fc1b920bad2ffd65331463e148b