Merge "Reduce UEB listener timeout"