Merge "Clean up test logging and ScreenRecord" into sc-v2-dev