Merge "don't use compile-time configuration of libgui as much as possible" into jb-mr2-dev