Merge "MediaPlayer subtitle data / time discontinuity interfaces" into pi-dev