SSP-2879 Fix Tool Header Student Info Disappearance
SSP-2720 Fix Cancel on Quick Add to be Gentler