merge InProgressDirty into InProgress (#8777)
### Description
This saves some memory and streamlines the behavior.
It also lazily removes collectibles, children and dependencies even when
entering the previous InProgressDirty (now InProgress stale) state.
### Testing Instructions
<!--
Give a quick description of steps to test your changes.
-->
