Merge "Surface: Use buffer id to synchronize slots" into oc-dev am: adf0ad2090
am: fe614d7b37

Change-Id: I24d58521c267ecf576160ac037d433c595c78960