Merge "Fix entry/exit animation to better follow DT."