Merge "Make screenshots from overview honor the passed-in display" into main