Merge "Tracking changes to renaming DisplayConfig to DisplayMode" into sc-dev