Merge "New enum values for logging Settings SetNewPasswordActivity events"