Merge "Have the Surface class track the buffer age." into oc-mr1-dev