Merge "Add ScreenRecord for a flaky test"