Merge "SF: Permit changing DispSync offsets at runtime"