Merge "Add animation type in SurfaceAnimator"