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

Change-Id: I01b8012c941001530678f944670a083e34b7ebc6