Merge "do not drop TS packet on discontinuity at payload start"