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

Change-Id: Ic0f790d41ce80f8a16a90a7978f31523a08644ff