Merge "Override layout in display cutout mode when needed" into 24D1-dev