Update TimedMediaHandler to master

Change-Id: Ic70981450aae54673b6abfc8afde09168231fe44
Merge "Update TimedMediaHandler to master" into wmf/1.21wmf9