Merge "Replace SyncTarget with SurfaceSyncGroup"