Merge "Remove missed WatchedItem::resetNotificationTimestamp in test"