Merge "Support display cutout side override" into main