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

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