Merge "Fix DisplayGroup event reporting behavior." into sc-dev