Merge "Remove legacy exit animation condition" into main