Merge "Make non-main displays take headless screenshots." into main