Merge "Reorder the passkey username & displayname" into udc-dev