Merge "Fix WatchedItemStore last-seen stashing logic"