Merge "libgui: Fix infinite recursion"