Merge "Reset direct output thread timestamp on flush"