Merge "GenericSource: reset timed text/subtitle after seek" into oc-dr1-dev am: 87b901caa1
am: 93d85e7929

Change-Id: I1106b56d1868b2895b8829235f95d953991b0549