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

Change-Id: Id3898999ae4227027f95f67e16a2192eab3fbf9a