Merge "Display Cutout Error" into main