Merge "Move WatchedItem logic to WatchedItemStore"