Merge "Screenshot: extend scrim under cutout" into pi-dev am: 113f9f85f4
am: 5ef5aa580e

Change-Id: I4f8eb01bd096553dbcbc495abb7a41c0b5018bb6