Merge "Uncache things in WatchedItemStore::updateNotificationTimestamp"