Merge "Give the Desktop Mode owners ownership of DesktopModeFlags utility." into main