Merge "Don't tell Assistant to hide on gesture completion or cancel" into qt-r1-dev