Merge "Add type alias for DeviceId" into main