Merge "Revert "Add screen recording to flaky test"" into main