LPS-37390 ADT storage in preferences should include the groupId