Merge "Surface: add getRemovedBuffer API" into oc-dev