Update TimedMediaHandler to master

Change-Id: I405f56c0935e9711af900c94b69300cd6ee7209b
Merge "Update TimedMediaHandler to master" into wmf/1.21wmf7