am 86e392e9: Merge "don\'t use compile-time configuration of libgui as much as possible" into jb-mr2-dev

* commit '86e392e9b3b92e3a58d2fb65eef1552108941a76':
  don't use compile-time configuration of libgui as much as possible