Merge "Implement early animation cancel thru merge" into main