Merge "libgui: Add a union to BufferItem for refactoring"