Merge "Remove unnecessary animation code that causes crashes" into main