Merge "Address API feedback for ApduServiceInfo" into main