Merge "Cancel voice assist session on user switch" into mnc-dev