Merge "Clean up screen record for tests" into sc-v2-dev