Merge "Type hint against LinkTarget in WatchedItemStore"