Merge "Cleaning up screenrecord for fixed tests" into main