Merge "Do not highlight group expanders" into sc-dev