Merge pull request #24338 from marination/batch-selector

fix: Batch/Serial Selector for Scanned Batched Item