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

Change-Id: I3c313a53bfbb5deb904a12ff8b59ae7edaf28ed0