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

Change-Id: I9095ebe2537bb4b8344fb31d35e544d978082aee