Unbreak group workflow state selector

Change-Id: I4e8fdebf6bb895771c334342e2e525a0f69c42a0
Merge "Unbreak group workflow state selector"