Merge "Always show error messages on bouncer" into qt-dev