Merge "[Dev option] Add a partial copy of DesktopModeFlags to WMCore" into main