Merge "Remove onSyncComplete from SurfaceSyncGroup"