Merge "ScreenDecorations: Only draw cutout if requested" into pi-dev