Merge "Fix screenshot behavior with display cutout" into sc-dev