Update TimedMediaHandler to master

Change-Id: If601365ea58a03cbaab4e97d838f625e28d83ebf