Merge "Fix device name issues for system sessions" into main