Merge "Move counting of watchers to WatchedItemStore"