Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread