Merge "Refactor managers that defer notification removal"