Merge "Handle START_LISTEN & STOP_LISTEN in group creating state" into tm-mainline-prod