Merge "Remove usages of ScreenCapture#captureDisplay." into main