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

Change-Id: Iac830e536f3beef53d26d44789afbe173e35ba3b