Merge "Use unique Handler for media, and synchronize it" into qt-qpr1-dev
am: fd6f170e31

Change-Id: I794799d85e407cdd110f9a72a061b1250443ce09