Merge changes Ibab0eff8,Ib02e2c8f

* changes:
  MediaMetrics: Make Item final
  MediaMetrics: Move Item::Prop to the start of the class