Merge "SF: remove DispSyncSource"