Merge "Split interface from WatchedItemStore"