Merge "Refactor sending notifications from PublishDraft"