Merge "sf: Defer DispSync initialization"