Merge "DisplayCutout: Add more display cutout flavors"