Merge "Re-write conditional checks for animation" into main