Merge "Specify UID in getAuthenticatorIds" into sc-dev