Merge "Switch Signature of WatchedItemStore::addWatchBatch"