Merge "Fix issue where bouncer won't be dismissed when being dragged" into qt-r1-dev