Merge "Minor improvements on voice interaction workflows." into qt-dev am: 7aa28bd502
am: 729b6b43ad

Change-Id: Icb11a14839a4848547d9b4bbbd05612ba2347109