Merge "Add autofillId in getCredResponse" into main