Merge "Rename DisplayConfig to DisplayMode" into sc-dev