LPS-38072 Enable AcitivitySet grouping