Remove existing invalidations before scheduling new ones #16772

Description:

@diosmosis is this what you meant regarding Custom Reports?

Review

• [ ] Functional review done
• [ ] Usability review done (is anything maybe unclear or think about anything that would cause people to reach out to support)
• [ ] Security review done see checklist
• [ ] Code review done
• [ ] Tests were added if useful/possible
• [ ] Reviewed for breaking changes
• [ ] Developer changelog updated if needed
• [ ] Documentation added if needed
• [ ] Existing documentation updated if needed

Tested it locally and looked good

@tsteur am adding a test currently

@diosmosis just did add one now... committing