Merge "Fix issue with display cutout being incorrectly rotated" into main