Merge "Revert "Set the log callback earlier for showing system property set denials""