Merge "Allow different visual and voice assist prompts" into mnc-dev