Merge "Avoid showing the screenshot ui on external displays" into main