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

Change-Id: I83f228f42789b40816c39b517c53e35ae74f2554