Merge "Text changes to assist & voice input" into mnc-dev