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

Change-Id: Iafa988856e05e87b6fdca249c2c1ea5121a9d132