Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"