Merge "Explicitly set animation and timings for split cancel button" into main