Merge "Revert "Add ScreenRecord for a flaky test""