Merge "Fix SurfaceAnimator and SurfaceAnimationRunner tests"