Merge changes I4c65e433,If447795f

* changes:
  Add mNamePlusId to hasClientComposition trace
  Name the ScreenCaptureOutput