Merge "[Dev options][More flags] Update all usages of some flags to use DesktopModeFlags." into main