Merge "Resolve UEB listener dblib config issue"