Merge "add support for up to 16 buffers per surface" into kraken