Merge "Move EmailNotification watchlist handling into helper method"