Merge "Add support for up to 32 buffers per Surface"