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