Merge "Dismiss system windows on screenshot action" into main