Merge "Move countVisitingWatchers to WatchedItemStore"