Merge "sf: Defer DispSync initialization" into oc-dr1-dev