Merge "Fix pressing back on bouncer" into qt-dev