Merge "msm_serial_hs: Wait for discard flush completion for UART Rx channel"