Merge "Fix crash in ConfirmDeviceCredentials" into nyc-dev