am 4ebb44e8: Merge "Fix libgui tests."

* commit '4ebb44e8cc42231bc9c4588ec3432eae9770483a':
  Fix libgui tests.