Merge "Update external display settings to use DesktopExperienceFlags" into main