Merge proposals dependent on lp://staging/~gordallott/unity/fix-highlight-showing-on-nonexpandable-groups

1. fix-highlight-showing-on-nonexpandable-groups
2. Dependent merge proposals