Merge "[0/n] Add flag for modals dialogs in windowing mode" into main