Merge "Correct string ConfirmDeviceCredentialActivity" into sc-dev