Merge "Adding support for skipping animation cancel on reapply" into main