Merge "Revert "Make sure we keep the screen record even if the test succeeds"" into main