Merge "Revamp logging for Credential Manager" into main