Merge "Schedule cleanup with the callback that was passed in" into sc-dev