Merge "Camera: Keep a list of outstanding buffers" into nyc-dev