Merge "Collapsing the heads up when showing the bouncer" into qt-r1-dev