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

Change-Id: I643afacd79bd58c7acf1873db0cd1b01f09089b9