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

Change-Id: I03c8d79179c08e77984ee78bfc36c8c0ebb02c8e