Merge "SF: Update DispSync to std::vector."