Merge "More SurfaceAnimator lifetime fixes." into qt-dev