Merge "Add DisplayGroup ID to DisplayInfo" into sc-dev