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

Change-Id: I392ec4b82ef5c5a9592cdb85e0258f0fdf9b24eb