Merge "Have each Display be associated with a DisplayGroup and DPC" into sc-dev