Merge "Fix data stall false alarm caused by TCP signal"