Merge "Unset sync group if sync state does not set" into main