Merge "Correct the cutout of external displays" into udc-d1-dev