Merge "New Pipeline: Fix groups not grouping when shade is open."