Merge "Screenshot a single display per invocation" into main