Merge "First step of refactoring 'timedtext' code."