Merge "Handle display cutouts larger than system bars" into main