Merge "Add unique ID to GraphicBuffer"