LPS-37390 ADT storage in preferences should include the groupId

Hey Julio,

First 8 commits are fixes or improvements (e.g. renaming preferences) previous to the actual solution and tests (last 7 commits). Thus, even if we needed to discuss the solution, the first set of commits could be merged separately.

Thanks!