LPS-46304 Properly track deletions for the Gadget entity
LPS-46308 Handling deletions properly for wsrp entities