Merge "Revert^2 "A few fixes for animation takeovers."" into main