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