Merge "viewcapture: guarantee happens-before relationship" into main