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