Fixed possible grouped callback infinite recursion bug created in
previous commit.

Change-Id: I024a81c4985f89a7205c79e7073b5e34effa4332