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

Change-Id: Ic648b5e22c18337cb1e71c93adfb78dcc9707bac