Merge "Log animation jank" into main