Merge changes I817b768e,I35282d6a into main

* changes:
  Add best-effort ViewCapture frame mapping
  FrameMapper: support multiple traces of same type