Merge "libgui: Prepare for IGBC::BufferItem removal"