MediaSet: Remove ugly hack

Delete pointer instead of creating a new shared_ptr

Change-Id: I7b6c736821771812353d01515f581e0324a1301f