Merge "Remove un-needed cast for array key in WatchedItemStore"