Merge "EmailNotification: Hard deprecate updateWatchlistTimestamp()"