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