Merge "SF: Stop passing DispSync around."