Merge "[ScreenCaptureTest] Remove captureDisplay." into main