Merge "Cutout: Fix broken cutout rendering in landscape" into pi-dev
am: 26c25f0033

Change-Id: I2e256085c93e9c5968477f715f4d0929e0e74f8f