Merge "Dismiss bouncer properly on SHADE_LOCKED" into qt-r1-dev