Merge "Move EmailNotification::updateWatchlistTimestamp to WatchedItemStore"