Merge "Play timed text even after 35.79 minutes" am: 66bee4de48
am: 7b65e85b6f

* commit '7b65e85b6f4fb063b5156c39e36c5e115e81d935':
  Play timed text even after 35.79 minutes