am b47584f4: am 2e398e64: Merge "SF: Permit changing DispSync offsets at runtime"

* commit 'b47584f46bd850723679d9212f66df1951bbdf5d':
  SF: Permit changing DispSync offsets at runtime