Merge "[dev_option] Use DesktopModeFlags from core instead of Shell" into main