Update TimedMediaHandler to master

Change-Id: Iab051df6542b93ac76def184c69a4c1259f12766