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

Change-Id: I5a3efbb5f90d576f467b1d9dcbc83d168cc05f24