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

Change-Id: I9f664b635ad39c12a01e2cae2ad6ba6b7fa13265