am 5b6ebd71: Merge "libgui_test: fix a couple minor test issues" into jb-mr2-dev

* commit '5b6ebd716c2bae657898562997ebb3b7d7b8a575':
  libgui_test: fix a couple minor test issues