Merge "A few fixes for animation takeovers." into main