Merge "Enabling screen record for some flaky tests" into sc-dev