Merge "Make WatchedItem members private"