Merge "ContextHubTransactionManager: Cleanup logging" into main