[PLAT-3060] Don't create empty column groups
[PLAT-3031] Fixed IDs in the analytics grid row metadata
Merge branch 'develop' into ui/dev