Merge "Make screenshots use the focused display for some screenshot types" into main