am fece8306: am 56f1f16c: Merge "libgui: Fix some bitrot/warnings in tests"

* commit 'fece83060e9640636f00a97fe236aff353d78c71':
  libgui: Fix some bitrot/warnings in tests