Merge "viewcapture tracing: flag cleanup" into main