Merge "Implement new cross-activity-back animation spec" into main