Merge "Refactor SurfaceSyncer to use SurfaceSyncGroups instead of syncId"