Merge "Improved screenshot policy for desktop and split mode" into main