Merge "Use default DSU slot name when active DSU is empty"