Merge "Use WatchedItemStore in ApiQueryInfo::getWatchedInfo"