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

Change-Id: I7625c94ba397df5dca55264148af485015f8be40