Merge "Revert "Adding screen record for a flake"" into sc-v2-dev