Merge "Fix display cutout being set to size 0"