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

Change-Id: If730bc2f28b0ae2a6a69ad7f7a82149285b12335