Merge "Implement better handling of text in assist." into mnc-dev