Merge "[Media] Add some tracing to media classes." into tm-dev