Merge "Add no cutout configs for secondary built-in display" into main