Merge "Add an option to ignore display cutout in DisplayWindowSettings"