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

Change-Id: I318bcd5a54644449b391731d94fd1c2ef2caa4bc