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

Change-Id: I004617ccc72bec5e8c4270fc2991eab650e2ff6d