Merge "Fix offset bounds cut off display cutout region"