Merge "Better transport stream timestamp handling." into jb-mr1-dev