Merge "libgui: 64-bit compile issues"