Forms: fix removeGroup if control is in container