Merge "Screenshot: extend scrim under cutout" into pi-dev