Merge "Remove unused methods of SurfaceAnimator" into main