Merge "Fix the display problem of the cutout" into main