Merge "Add sync-group timeout for transition" into sc-v2-dev