Merge "Refine the error message about the cutout mode" into main