Merge "Avoid premature redraw of display cutout" into main