Merge "Remove legacy edge extension code from SurfaceAnimationRunner" into main