MDL-33697: Merge the 2 assignment notification types