Replace shape-based empty batch handling inside DPDataLoader with structure-aware approach

Replace shape-based empty batch handling inside DPDataLoader with structure-aware approach #612