Merge "Only use simple rects for cutout region" into pi-dev