Merge "WatchedItemStore: Fix fatal when revision is deleted"