Merge "diag: Fix to support separate packet stream for UART MODE"