Merge "[dev_option] Remove DesktopModeFlags from Shell" into main