Merge "More SurfaceAnimator lifetime fixes." into qt-dev
am: ed5d40cf26

Change-Id: Iea26915848f87f0c905491abb6aaa5968c84ca94