[CP Staging] Fix creating unexpected groups when creating a split from a group

[CP Staging] Fix creating unexpected groups when creating a split from a group #15543