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

Change-Id: If075910e28f94462c1b24b650afa1b0fcad8d144