Merge "diag: Wrap Delayed Response ID when it reaches its Maximum Value"