Merge "fix: Refactor User Lifecycle Event and Report metrics logging" into udc-dev