Merge "Set component name only for ConfirmDeviceCredentialActivity." into main