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

Change-Id: If37d3ceb5c98c85e9d2b4aae6dd27fe7151bfc9c