Merge "Fix capturing mid-transition frames" into main