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

Change-Id: I4b7c2ef2a51e7ce921d30a8229b605b77d396220