Merge "DisplayCutout: Fix corner cutout issues in SystemUI" into pi-dev